From ebbc3fff0c291b6a71ab5585b0b5d265aeea0630 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 29 Jul 2007 19:18:52 -0700 Subject: [PATCH] Fix mail locking for Debian's non-Linux architectures. --- debian/changelog | 7 +++++++ .../require-movemail-use-liblockfile.diff | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/debian/changelog b/debian/changelog index d7931ff324d..84a56685002 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +emacs22 (22.1+1-2) unstable; urgency=low + + * Fix mail locking patch for Debian's non-Linux architectures. Thanks + to Michael Banck . (closes: #433816) [rlb] + + -- Rob Browning Sun, 29 Jul 2007 19:04:00 -0700 + emacs22 (22.1+1-1) unstable; urgency=low * New upstream release. (closes: #427279) [rlb] diff --git a/debian/patches/require-movemail-use-liblockfile.diff b/debian/patches/require-movemail-use-liblockfile.diff index 1187b5e05a9..f398e8baea2 100644 --- a/debian/patches/require-movemail-use-liblockfile.diff +++ b/debian/patches/require-movemail-use-liblockfile.diff @@ -22,3 +22,19 @@ Index: sid/lib-src/movemail.c int main (argc, argv) int argc; +Index: sid/src/s/bsd4-3.h +=================================================================== +--- sid.orig/src/s/bsd4-3.h ++++ sid/src/s/bsd4-3.h +@@ -98,7 +98,11 @@ + The alternative is that a lock file named + /usr/spool/mail/$USER.lock. */ + ++/* conditional copied from gnu-linux.h */ ++#if !((defined (HAVE_LIBMAIL) || defined (HAVE_LIBLOCKFILE)) && \ ++ defined (HAVE_MAILLOCK_H)) + #define MAIL_USE_FLOCK ++#endif + + /* Define CLASH_DETECTION if you want lock files to be written + so that Emacs can tell instantly when you try to modify -- 2.30.2